Merge from emacs-24; up to r111286
authorGlenn Morris <rgm@gnu.org>
Thu, 21 Feb 2013 16:56:49 +0000 (08:56 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 21 Feb 2013 16:56:49 +0000 (08:56 -0800)
commite0dd69002abbfe418a9af90759a15072efccd167
tree17cd322fdf539932244bc1343a5cbac0d2211951
parentd46868897a8c305ae4b5ca47662ee14b767a37a3
parentd4aca5533a854261768ff7e2fe39014c51bc9577
Merge from emacs-24; up to r111286
lisp/ChangeLog
lisp/net/tramp.el
lisp/progmodes/python.el
test/ChangeLog